bitkeeper revision 1.1159.189.4 (41a4d3f3keEAmBOlWfNQuSajvc5nHw)

Merge arcadians.cl.cam.ac.uk:/local/scratch-2/cl349/xen-tmp.bk
into arcadians.cl.cam.ac.uk:/local/scratch-2/cl349/xen.bk-smp-public

diff --cc xen/arch/x86/domain.c
Simple merge

diff --cc xen/arch/x86/memory.c
index f2df205907c27f9ccc48d6320db90a4b8cc7a064,c6d9951bc56399ae06546ca426de2b8a1c84f331..4068583821cf942330f5eb2650858f27bc7b3295
--- 1/xen/arch/x86/memory.c
--- 2/xen/arch/x86/memory.c
+++ b/xen/arch/x86/memory.c
@@@ -1462,9 -1458,8 +1465,9 @@@ int do_mmu_update(mmu_update_t *ureqs, 
      }
  
      if ( unlikely(success_count != NULL) )
-         put_user(count, success_count);
+         put_user(i, success_count);
  
 +    UNLOCK_BIGLOCK(d);
      return rc;
  }
  

diff --cc xen/arch/x86/traps.c
index cc33ce2d385912840d7265d41728f53eecfd7f93,3a8f8cdd1568f45b6c058aeb74bdddb9e7a2238f..c3a6453e7ea1167c1aa1daa937149629dfda8fc6
--- 1/xen/arch/x86/traps.c
--- 2/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@@ -810,10 -802,10 +810,12 @@@ long do_set_trap_table(trap_info_t *tra
      trap_info_t cur;
      trap_info_t *dst = current->thread.traps;
  
 +    LOCK_BIGLOCK(current->domain);
 +
      for ( ; ; )
      {
+         hypercall_may_preempt(__HYPERVISOR_set_trap_table, 1, traps);
+ 
          if ( copy_from_user(&cur, traps, sizeof(cur)) ) return -EFAULT;
  
          if ( cur.address == 0 ) break;

diff --cc xen/arch/x86/x86_32/entry.S
Simple merge

diff --cc xen/common/dom_mem_ops.c
Simple merge

diff --cc xen/common/grant_table.c
Simple merge

diff --cc xen/include/xen/sched.h
Simple merge